Drop use of GDK_DISABLE_DEPRECATED guards in gdk

We now use function attributes for deprecation so the build-breaking
guards are no longer needed.

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index d3a84913b699affc8f36e5fa248439d166e3d0fa..3e4dc16ac9b94edddd4b18f150267fc97824ba66 100644 (file)
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -40,13 +40,11 @@ G_BEGIN_DECLS
 
 GType                gdk_app_launch_context_get_type      (void);
 
-#ifndef GDK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gdk_display_get_app_launch_context)
 GdkAppLaunchContext *gdk_app_launch_context_new           (void);
 GDK_DEPRECATED_FOR(gdk_display_get_app_launch_context)
 void                 gdk_app_launch_context_set_display   (GdkAppLaunchContext *context,
                                                            GdkDisplay          *display);
-#endif
 void                 gdk_app_launch_context_set_screen    (GdkAppLaunchContext *context,
                                                            GdkScreen           *screen);
 void                 gdk_app_launch_context_set_desktop   (GdkAppLaunchContext *context,

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index bfc98ccca7507ba7e2e5c1b564006491a26e8f84..c49c61cceb8db5fef358862082a9da644f02113f 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -228,12 +228,10 @@ GdkCursor* gdk_cursor_new_from_pixbuf      (GdkDisplay      *display,
 GdkCursor*  gdk_cursor_new_from_name    (GdkDisplay      *display,
                                          const gchar     *name);
 GdkDisplay* gdk_cursor_get_display      (GdkCursor       *cursor);
-#ifndef GDK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(g_object_ref)
 GdkCursor * gdk_cursor_ref               (GdkCursor       *cursor);
 GDK_DEPRECATED_FOR(g_object_unref)
 void        gdk_cursor_unref             (GdkCursor       *cursor);
-#endif
 GdkPixbuf*  gdk_cursor_get_image         (GdkCursor       *cursor);
 GdkCursorType gdk_cursor_get_cursor_type (GdkCursor       *cursor);
 

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index e2231310d6498ad19ceb10796cf6e8ac52507118..9f24d038aff72c052b5f7efa8a124bdf5b1aae1a 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -52,7 +52,6 @@ GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
 GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);
 
 #ifndef GDK_MULTIDEVICE_SAFE
-#ifndef GDK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gdk_device_ungrab)
 void        gdk_display_pointer_ungrab     (GdkDisplay  *display,
                                             guint32      time_);
@@ -61,7 +60,6 @@ void        gdk_display_keyboard_ungrab    (GdkDisplay  *display,
                                             guint32      time_);
 GDK_DEPRECATED_FOR(gdk_display_device_is_grabbed)
 gboolean    gdk_display_pointer_is_grabbed (GdkDisplay  *display);
-#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */
 
 gboolean    gdk_display_device_is_grabbed  (GdkDisplay  *display,
@@ -73,10 +71,8 @@ void        gdk_display_flush              (GdkDisplay  *display);
 void        gdk_display_close                  (GdkDisplay  *display);
 gboolean    gdk_display_is_closed          (GdkDisplay  *display);
 
-#ifndef GDK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gdk_device_manager_list_devices)
 GList *     gdk_display_list_devices       (GdkDisplay  *display);
-#endif /* GDK_DISABLE_DEPRECATED */
 
 GdkEvent* gdk_display_get_event  (GdkDisplay     *display);
 GdkEvent* gdk_display_peek_event (GdkDisplay     *display);
@@ -92,7 +88,6 @@ void gdk_display_set_double_click_distance (GdkDisplay   *display,
 GdkDisplay *gdk_display_get_default (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE
-#ifndef GDK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gdk_device_get_position)
 void             gdk_display_get_pointer           (GdkDisplay             *display,
                                                     GdkScreen             **screen,
@@ -108,7 +103,6 @@ void             gdk_display_warp_pointer          (GdkDisplay             *disp
                                                     GdkScreen              *screen,
                                                     gint                   x,
                                                     gint                   y);
-#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */
 
 GdkDisplay *gdk_display_open_default_libgtk_only (void);

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index 8517f6176e5b8af57e7def4377209ffaa846f3ed..219c968e393d2849ef03e1b3984665f1e389d245 100644 (file)
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -78,7 +78,6 @@ const gchar *         gdk_get_display_arg_name (void);
 gchar*        gdk_get_display        (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE
-#ifndef GDK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gdk_device_grab)
 GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
                                       gboolean      owner_events,
@@ -90,20 +89,17 @@ GDK_DEPRECATED_FOR(gdk_device_grab)
 GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
                                       gboolean      owner_events,
                                       guint32       time_);
-#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */
 
 #ifndef GDK_MULTIHEAD_SAFE
 
 #ifndef GDK_MULTIDEVICE_SAFE
-#ifndef GDK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gdk_device_ungrab)
 void          gdk_pointer_ungrab     (guint32       time_);
 GDK_DEPRECATED_FOR(gdk_device_ungrab)
 void          gdk_keyboard_ungrab    (guint32       time_);
 GDK_DEPRECATED_FOR(gdk_display_device_is_grabbed)
 gboolean      gdk_pointer_is_grabbed (void);
-#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIDEVICE_SAFE */
 
 gint gdk_screen_width  (void) G_GNUC_CONST;